Merge v1.1.1 into firehose/1.x#13
Merged
Merged
Conversation
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* chore(common): set mainnet activation date Co-authored-by: Codex <codex-noreply@coinbase.com> * fix ci after beryl mainnet scheduling Co-authored-by: Codex <codex-noreply@coinbase.com> * fix basectl unscheduled hardfork test Co-authored-by: Codex <codex-noreply@coinbase.com> --------- Co-authored-by: Codex <codex-noreply@coinbase.com>
* insert parent block hash into pending EVM * typed errors for FlashblockId, use pair of Atomics * fix test failures due to harness adjustment * fmt fix * chore: retrigger CI for release retarget
Release v1.1.1
v1.1.1 (PR base#3603) added a prev_flashblock_id predecessor-link arg to FlashblockSequenceValidator::validate and a NonSequentialPredecessor result variant. Pass metadata.prev_flashblock_id from the firehose processor, handle the new variant (reset + wait for base), and update test Metadata literals for the added field.
Tests for the v1.1.1 NonSequentialPredecessor path in the firehose flashblocks processor: mismatched prev_flashblock_id resets state, matching id is accepted, default (unset) id stays backward-compatible. Adds flash_delta_with_prev_id test helper. Docs under docs/firehose/ answer four review questions: the reset tests, Dockerfile.sf build status, Beryl block-model impact, and the pending-EVM parent-hash fix.
sduchesneau
added a commit
that referenced
this pull request
Jun 19, 2026
Committed unintentionally via PR #13; these were review notes, not meant to land in the tree.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges upstream Base
v1.1.1(tag) into the firehose-instrumentedfirehose/1.xbranch.Upstream changes in v1.1.1 (3 commits over v1.1.0)
d21284244chore(release): set version to 1.1.14e84ba3d1chore(common): set Beryl mainnet activation date (timestamp1782410400)01e732cdbBackport PR fix(flashblocks):BLOCKHASHdivergence bw pending and canonical EVM execution, harden sequence linkage base/base#3603: insert parent block hash into pending EVM; typedFlashblockIderrors; flashblocks predecessor-link validationFirehose adaptation (this PR's extra commit)
PR base#3603 changed
FlashblockSequenceValidator::validateto take a 5th argprev_flashblock_id: FlashblockIdand added aNonSequentialPredecessorresult variant. The firehose flashblocks processor calls this validator, so it was updated to:flashblock.metadata.prev_flashblock_id(theMetadatastruct gained this#[serde(default)]field)NonSequentialPredecessorvariant (reset state, wait for next base — same asNonSequentialGap)Metadataliterals for the added fieldVerification
cargo check --workspace --all-targets: cleancargo test -p base-firehose-flashblocks -p base-common-chains: pass (sequence + dispatcher integration tests included)Note: building test-utils requires
forge buildincrates/utilities/test-utils/contractsto generate the newParentBlockhashGuard.solartifact (gitignoredout/).